]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
portalHelper: Remove pointless destroyWindow() method
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 8 Mar 2023 18:27:27 +0000 (19:27 +0100)
committerMarge Bot <marge-bot@gnome.org>
Tue, 25 Apr 2023 10:45:19 +0000 (10:45 +0000)
Years ago, the function used to clean up the cache when the
window was closed. But now that an ephemeral data manager is
used, nothing is cached anymore and the function is left as
a mere wrapper around this.destroy().

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2690>

js/portalHelper/main.js

index cdf8b51cceac4350f014628b9ac6c7b41f4a880b..62a522e51aa1577cefdd202b58d755cd44f621e1 100644 (file)
@@ -116,7 +116,6 @@ class PortalWindow extends Gtk.ApplicationWindow {
     _init(application, url, timestamp, doneCallback) {
         super._init({ application });
 
-        this.connect('delete-event', this.destroyWindow.bind(this));
         this._headerBar = new PortalHeaderBar();
         this._headerBar.setSecurityIcon(PortalHelperSecurityLevel.NOT_YET_DETERMINED);
         this.set_titlebar(this._headerBar);
@@ -161,10 +160,6 @@ class PortalWindow extends Gtk.ApplicationWindow {
         this.application.set_accels_for_action('app.quit', ['<Primary>q', '<Primary>w']);
     }
 
-    destroyWindow() {
-        this.destroy();
-    }
-
     _syncUri() {
         let uri = this._webView.uri;
         if (uri)
@@ -293,7 +288,7 @@ class WebPortalHelper extends Gtk.Application {
         this._queue = [];
 
         let action = new Gio.SimpleAction({ name: 'quit' });
-        action.connect('activate', () => this.active_window.destroyWindow());
+        action.connect('activate', () => this.active_window.destroy());
         this.add_action(action);
     }
 
@@ -326,7 +321,7 @@ class WebPortalHelper extends Gtk.Application {
 
             if (obj.connection == connection) {
                 if (obj.window)
-                    obj.window.destroyWindow();
+                    obj.window.destroy();
                 this._queue.splice(i, 1);
                 break;
             }